From 643b106b408b081b51040fc96a6ea650059203b9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 8 Jul 2011 18:35:24 +0100 Subject: [PATCH] libxl: do not use tap disk backend other than for raw and vhd tap does not support qcow/qcow2; update disk_try_backend accordingly. Break out the "backend not suitable for this format" message so it can be reused. Remove now-redundant reporting from libxl_device_disk_local_attach and replace with abort(). Reported-by: Stefano Stabellini Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 4 +--- tools/libxl/libxl_device.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index d613ced695..c032e80b9c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1089,9 +1089,7 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) break; case LIBXL_DISK_FORMAT_QCOW: case LIBXL_DISK_FORMAT_QCOW2: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot locally attach" - " a qcow or qcow2 disk image"); - break; + abort(); /* prevented by libxl__device_disk_set_backend */ default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk format: %d", disk->format); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 0680211ec1..b644ce33f8 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -134,11 +134,7 @@ static int disk_try_backend(disk_try_backend_args *a, case LIBXL_DISK_BACKEND_PHY: if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || a->disk->format == LIBXL_DISK_FORMAT_EMPTY)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend phy" - " unsuitable due to format %s", - a->disk->vdev, - libxl_disk_format_to_string(a->disk->format)); - return 0; + goto bad_format; } if (a->disk->format != LIBXL_DISK_FORMAT_EMPTY && !S_ISBLK(a->stab.st_mode)) { @@ -157,12 +153,9 @@ static int disk_try_backend(disk_try_backend_args *a, a->disk->vdev); return 0; } - if (a->disk->format == LIBXL_DISK_FORMAT_EMPTY || - (S_ISREG(a->stab.st_mode) && !a->stab.st_size)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" - " unsuitable because empty devices not supported", - a->disk->vdev); - return 0; + if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || + a->disk->format == LIBXL_DISK_FORMAT_VHD)) { + goto bad_format; } return backend; @@ -175,6 +168,15 @@ static int disk_try_backend(disk_try_backend_args *a, return 0; } + abort(); /* notreached */ + + bad_format: + LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend %s" + " unsuitable due to format %s", + a->disk->vdev, + libxl_disk_backend_to_string(backend), + libxl_disk_format_to_string(a->disk->format)); + return 0; } int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { -- 2.30.2